merge with xen-unstable.hg

author awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>

Mon, 12 Mar 2007 16:07:08 +0000 (10:07 -0600)

committer awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>

Mon, 12 Mar 2007 16:07:08 +0000 (10:07 -0600)
author awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Mon, 12 Mar 2007 16:07:08 +0000 (10:07 -0600)
committer awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Mon, 12 Mar 2007 16:07:08 +0000 (10:07 -0600)
diff --cc linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c
Simple merge
diff --cc linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
Simple merge
author	awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
	Mon, 12 Mar 2007 16:07:08 +0000 (10:07 -0600)
committer	awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
	Mon, 12 Mar 2007 16:07:08 +0000 (10:07 -0600)
		1	2
linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c	patch \|	diff1 \|	diff2 \|	blob \| history
linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	patch \|	diff1 \|	diff2 \|	blob \| history